Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Apr 2010 23:33:39 +0000 (23:33 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 20 Apr 2010 23:33:39 +0000 (23:33 +0000)

Trivial merge